Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make CONFIG a CMake pass-through option for DART #339

Merged
merged 2 commits into from
Apr 12, 2022
Merged

Make CONFIG a CMake pass-through option for DART #339

merged 2 commits into from
Apr 12, 2022
+2 −2

Conversation

adlarkin
Copy link
Contributor

@adlarkin adlarkin commented Apr 5, 2022 •
edited
Loading

Signed-off-by: Ashton Larkin [email protected]

🎉 New feature

Requires gazebosim/gz-cmake#211

Summary

This PR makes use of gazebosim/gz-cmake#211 to revert the changes made in #121. Once this is merged, it will need to be forward-ported to ign-physics5.

Checklist

  • Signed all commits for DCO
  • Added tests
  • Added example and/or tutorial
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

@adlarkin adlarkin requested a review from j-rivero April 5, 2022 19:52
@github-actions github-actions bot added the 🏰 citadel Ignition Citadel label Apr 5, 2022
j-rivero
j-rivero reviewed Apr 5, 2022
View reviewed changes
Copy link
Contributor

@j-rivero j-rivero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably want to increase the required version of ign-cmake https://github.com/ignitionrobotics/ign-physics/pull/339/files#diff-1e7de1ae2d059d21e1dd75d5812d5a34b0222cef273b7c3a2af62eb747f9d20aL11

@codecov
Copy link

codecov bot commented Apr 5, 2022 •
edited
Loading

Codecov Report

Merging #339 (36a8fff) into ign-physics2 (50b36d2) will not change coverage.
The diff coverage is n/a.

@@              Coverage Diff              @@
##           ign-physics2     #339   +/-   ##
=============================================
  Coverage         83.15%   83.15%           
=============================================
  Files               108      108           
  Lines              4210     4210           
=============================================
  Hits               3501     3501           
  Misses              709      709

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 50b36d2...36a8fff. Read the comment docs.

@adlarkin
Copy link
Contributor Author

adlarkin commented Apr 5, 2022 •
edited
Loading

We probably want to increase the required version of ign-cmake

That's a good point, thanks for catching this! I have added the needs upstream release label to this PR, and will bump the ign-cmake version here once we have merged gazebosim/gz-cmake#211 and make a new ign-cmake release.

@adlarkin adlarkin added the needs upstream release Blocked by a release of an upstream library label Apr 5, 2022
@adlarkin adlarkin requested a review from j-rivero April 12, 2022 19:00
@adlarkin adlarkin removed the needs upstream release Blocked by a release of an upstream library label Apr 12, 2022
@adlarkin
Copy link
Contributor Author

@j-rivero I have updated this PR to require the newest release of ign-cmake which includes gazebosim/gz-cmake#211 (the release is gazebosim/gz-cmake#229), would you mind taking another look?

j-rivero
j-rivero approved these changes Apr 12, 2022
View reviewed changes
Copy link
Contributor

@j-rivero j-rivero left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good to go!

@adlarkin adlarkin merged commit dcafe3b into ign-physics2 Apr 12, 2022
@adlarkin adlarkin deleted the adlarkin/restore_config branch April 12, 2022 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@j-rivero j-rivero j-rivero approved these changes

@azeey azeey Awaiting requested review from azeey azeey is a code owner

@mxgrey mxgrey Awaiting requested review from mxgrey

@scpeters scpeters Awaiting requested review from scpeters scpeters is a code owner

Assignees
No one assigned
Labels
🏰 citadel Ignition Citadel
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@adlarkin @j-rivero